mir: group DND, tooltips, and notifications with menu-type windows
authorWilliam Hua <william.hua@canonical.com>
Fri, 12 Aug 2016 15:35:38 +0000 (11:35 -0400)
committerWilliam Hua <william.hua@canonical.com>
Fri, 12 Aug 2016 15:37:35 +0000 (11:37 -0400)
gdk/mir/gdkmirwindowimpl.c

index fc86349c9b6e8105eb9a8e358e195c51a50983ff..a7be39cb319623f80f5903fb6d0d78bf9f19df1b 100644 (file)
@@ -123,21 +123,21 @@ type_hint_differs (GdkWindowTypeHint lhs, GdkWindowTypeHint rhs)
       case GDK_WINDOW_TYPE_HINT_POPUP_MENU:
       case GDK_WINDOW_TYPE_HINT_TOOLBAR:
       case GDK_WINDOW_TYPE_HINT_COMBO:
+      case GDK_WINDOW_TYPE_HINT_DND:
+      case GDK_WINDOW_TYPE_HINT_TOOLTIP:
+      case GDK_WINDOW_TYPE_HINT_NOTIFICATION:
         return rhs != GDK_WINDOW_TYPE_HINT_MENU &&
             rhs != GDK_WINDOW_TYPE_HINT_DROPDOWN_MENU &&
             rhs != GDK_WINDOW_TYPE_HINT_POPUP_MENU &&
             rhs != GDK_WINDOW_TYPE_HINT_TOOLBAR &&
-            rhs != GDK_WINDOW_TYPE_HINT_COMBO;
+            rhs != GDK_WINDOW_TYPE_HINT_COMBO &&
+            rhs != GDK_WINDOW_TYPE_HINT_DND &&
+            rhs != GDK_WINDOW_TYPE_HINT_TOOLTIP &&
+            rhs != GDK_WINDOW_TYPE_HINT_NOTIFICATION;
       case GDK_WINDOW_TYPE_HINT_SPLASHSCREEN:
       case GDK_WINDOW_TYPE_HINT_UTILITY:
         return rhs != GDK_WINDOW_TYPE_HINT_SPLASHSCREEN &&
             rhs != GDK_WINDOW_TYPE_HINT_UTILITY;
-      case GDK_WINDOW_TYPE_HINT_DND:
-      case GDK_WINDOW_TYPE_HINT_TOOLTIP:
-      case GDK_WINDOW_TYPE_HINT_NOTIFICATION:
-        return rhs != GDK_WINDOW_TYPE_HINT_DND &&
-            rhs != GDK_WINDOW_TYPE_HINT_TOOLTIP &&
-            rhs != GDK_WINDOW_TYPE_HINT_NOTIFICATION;
       case GDK_WINDOW_TYPE_HINT_NORMAL:
       case GDK_WINDOW_TYPE_HINT_DESKTOP:
       default: